projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 29f1953 d85faf8)
bitkeeper revision 1.15.1.1 (3e26ce4cFZZkDsoofHF9hDadLO0avg)
authoriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Thu, 16 Jan 2003 15:22:52 +0000 (15:22 +0000)
committeriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Thu, 16 Jan 2003 15:22:52 +0000 (15:22 +0000)
Merge labyrinth.cl.cam.ac.uk:/usr/groups/xeno/BK/xeno
into labyrinth.cl.cam.ac.uk:/anfs/scratch/labyrinth/iap10/xeno2/xeno.bk

1  2 
BitKeeper/etc/logging_ok patch | diff1 | diff2 | blob | history
xen-2.4.16/Makefile patch | diff1 | diff2 | blob | history

diff --cc BitKeeper/etc/logging_ok
index bf45a4d7d0c7ccc01839344a8e3dd9871a250ddd,db380ba55701e67f28d2934cb9d89621781eacaa..9164d8ac247ba3d564973099a2507ae96b86dc9d
--- 1/BitKeeper/etc/logging_ok
--- 2/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@@ -1,5 -1,5 +1,6 @@@
  akw27@boulderdash.cl.cam.ac.uk
 +akw27@labyrinth.cl.cam.ac.uk
+ iap10@labyrinth.cl.cam.ac.uk
  kaf24@labyrinth.cl.cam.ac.uk
  kaf24@plym.cl.cam.ac.uk
  kaf24@striker.cl.cam.ac.uk
diff --cc xen-2.4.16/Makefile
Simple merge
Unnamed repository; edit this file 'description' to name the repository.